raymarine: Remove GUID generation.

Fix "PredictedTwa" output. Use some other default values.
Regenerate reference data.

diff --git a/raymarine.c b/raymarine.c
index cc1680cdad2aa3da550608623dfa348346e0d39a..828825a8b0433c15f7db725fa5334585a6030273 100644 (file)
--- a/raymarine.c
+++ b/raymarine.c
@@ -2,7 +2,7 @@
 
     Support for Raymarine Waypoint File (.rwf).
 
-    Copyright (C) 2006 Olaf Klein, o.b.klein@gpsbabel.org
+    Copyright (C) 2006,2007 Olaf Klein, o.b.klein@gpsbabel.org
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -29,6 +29,11 @@
        
        2006/10/30: Initial release (not yet in GPSBabel source tree)
        2006/11/08: 
+       2007/03/17: Remove GUIDs from writer (not really valid)
+                   Fix "PredictedTwa" output
+                   Initialize location with "My Waypoints"
+                   Change default value for RcCount and RelSet (now 0)
+
 */
 
 #include "defs.h"
@@ -47,7 +52,6 @@ static waypoint **depot;
 static short_handle hshort;
 static int size_of_depot, items_in_depot;
 static int rte_index, rte_wpt_index;
-static char *sguid;
 static char *opt_location;
 
 #define MYNAME "raymarine"
@@ -55,7 +59,7 @@ static char *opt_location;
 static
 arglist_t raymarine_args[] = 
 {
-       { "location", &opt_location, "Default location", "New location", ARGTYPE_STRING, ARG_NOMINMAX },
+       { "location", &opt_location, "Default location", "My Waypoints", ARGTYPE_STRING, ARG_NOMINMAX },
        ARG_TERMINATOR
 };
 
@@ -237,40 +241,6 @@ raymarine_read(void)
 /* %%%    R A Y M A R I N E   W R I T E R    %%% */
 /* ============================================= */
 
-
-static guid_t
-mkGUID(void)
-{
-       guid_t res;
-       
-       if (gpsbabel_time != 0) {
-               srand(gpsbabel_time + rand());
-               res = ((guid_t) (gpsbabel_time) << 48) | 
-                       ((guid_t)(rand() & 0xFFFF) << 32) | 
-                       ((guid_t)(rand() & 0xFFFF) << 16) | 
-                       (rand() & 0xFFFF);
-       }
-       else res = 0;
-       
-       return res;
-}
-
-static char *
-GUID2str(guid_t GUID)
-{
-       gbuint16 w0, w1, w2, w3;
-       char *res;
-       
-       w0 = GUID & 0xFFFF; GUID = GUID >> 16;
-       w1 = GUID & 0xFFFF; GUID = GUID >> 16;
-       w2 = GUID & 0xFFFF; GUID = GUID >> 16;
-       w3 = GUID & 0xFFFF;
-       
-       xasprintf(&res, "%d-%d-%d-%d", w0, w1, w2, w3);
-       return res;
-}
-
-
 static void
 register_waypoint(const waypoint *wpt)
 {
@@ -297,7 +267,7 @@ register_waypoint(const waypoint *wpt)
 }
 
 static void
-write_waypoint(gbfile *fout, const waypoint *wpt, const int waypt_no, const char *location, const char *GUID)
+write_waypoint(gbfile *fout, const waypoint *wpt, const int waypt_no, const char *location)
 {
        char *notes;
        char *name;
@@ -328,16 +298,15 @@ write_waypoint(gbfile *fout, const waypoint *wpt, const int waypt_no, const char
                notes
        );
        gbfprintf(fout, "Rel=\n"
-                       "RelSet=1\n"
-                       "RcCount=1\n"
+                       "RelSet=0\n"
+                       "RcCount=0\n"
                        "RcRadius=%.15f\n"
                        "Show=1\n"
                        "RcShow=0\n"
                        "SeaTemp=%.15f\n"
                        "Depth=%.15f\n"
-                       "Time=%.10f00000\n"
-                       "GUID=%s\n",
-               0.0, -32678.0, 65535.0, time, GUID
+                       "Time=%.10f00000\n",
+               0.0, -32678.0, 65535.0, time
        );
 }
 
@@ -346,11 +315,9 @@ write_route_head_cb(const route_head *rte)
 {
        gbfprintf(fout, "[Rt%d]\n"
                        "Name=%s\n"
-                       "Visible=1\n"
-                       "Guid=%s\n",
+                       "Visible=1\n",
                rte_index,
-               rte->rte_name,
-               sguid
+               rte->rte_name
        );
        rte_index++;
        rte_wpt_index = 0;
@@ -369,7 +336,7 @@ write_route_wpt_cb(const waypoint *wpt)
                "PredictedSet",
                "PredictedSog",
                "PredictedTime",
-               "PredictedTwa2",
+               "PredictedTwa",
                "PredictedTwd",
                "PredictedTws" };
                
@@ -424,13 +391,10 @@ raymarine_write(void)
        int i;
        queue *elem, *tmp;
        extern queue waypt_head;
-       guid_t guid;
        
        size_of_depot = 0;
        items_in_depot = 0;
        depot = NULL;
-       guid = mkGUID();
-       sguid = GUID2str(guid);
 
        /* enumerate all possible waypoints */
        QUEUE_FOR_EACH(&waypt_head, elem, tmp) {
@@ -442,7 +406,7 @@ raymarine_write(void)
        /* write out waypoint summary */
        for (i = 0; i < items_in_depot; i++) {
                waypoint *wpt = depot[i];
-               write_waypoint(fout, wpt, i, opt_location, sguid);
+               write_waypoint(fout, wpt, i, opt_location);
        }
        
        /* write out all routes with their waypoints */
@@ -450,7 +414,6 @@ raymarine_write(void)
        route_disp_all(write_route_head_cb, NULL, write_route_wpt_cb);
        
        if (depot != NULL) xfree(depot);
-       xfree(sguid);
 }
 
 /* ================================================== */

diff --git a/reference/expertgps.rwf b/reference/expertgps.rwf
index 64280cd30cace9653ecc8b7153861134b38954a3..7e9e77455fde54f41730311e33ff8dd1afde2128 100644 (file)
--- a/reference/expertgps.rwf
+++ b/reference/expertgps.rwf
@@ -1,5 +1,5 @@
 [Wp0]
-Loc=New location
+Loc=My Waypoints
 Name=5066
 Lat=42.438878000000003
 Long=-71.119276999999997
@@ -10,17 +10,16 @@ Fixed=1
 Locked=0
 Notes=5066
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37223.878796296300000
-GUID=0-0-0-0
 [Wp1]
-Loc=New location
+Loc=My Waypoints
 Name=5067
 Lat=42.439227000000002
 Long=-71.119688999999994
@@ -31,17 +30,16 @@ Fixed=1
 Locked=0
 Notes=5067
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143692129600000
-GUID=0-0-0-0
 [Wp2]
-Loc=New location
+Loc=My Waypoints
 Name=5096
 Lat=42.438916999999996
 Long=-71.116146000000001
@@ -52,17 +50,16 @@ Fixed=1
 Locked=0
 Notes=5096
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37211.960856481500000
-GUID=0-0-0-0
 [Wp3]
-Loc=New location
+Loc=My Waypoints
 Name=5142
 Lat=42.443904000000003
 Long=-71.122044000000002
@@ -73,17 +70,16 @@ Fixed=1
 Locked=0
 Notes=5142
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37223.878796296300000
-GUID=0-0-0-0
 [Wp4]
-Loc=New location
+Loc=My Waypoints
 Name=5156
 Lat=42.447298000000004
 Long=-71.121447000000003
@@ -94,17 +90,16 @@ Fixed=1
 Locked=0
 Notes=5156
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143726851800000
-GUID=0-0-0-0
 [Wp5]
-Loc=New location
+Loc=My Waypoints
 Name=5224
 Lat=42.454872999999999
 Long=-71.125094000000004
@@ -115,17 +110,16 @@ Fixed=1
 Locked=0
 Notes=5224
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143738425900000
-GUID=0-0-0-0
 [Wp6]
-Loc=New location
+Loc=My Waypoints
 Name=5229
 Lat=42.459079000000003
 Long=-71.124988000000002
@@ -136,17 +130,16 @@ Fixed=1
 Locked=0
 Notes=5229
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143738425900000
-GUID=0-0-0-0
 [Wp7]
-Loc=New location
+Loc=My Waypoints
 Name=5237
 Lat=42.456978999999997
 Long=-71.124474000000006
@@ -157,17 +150,16 @@ Fixed=1
 Locked=0
 Notes=5237
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143738425900000
-GUID=0-0-0-0
 [Wp8]
-Loc=New location
+Loc=My Waypoints
 Name=5254
 Lat=42.454400999999997
 Long=-71.120990000000006
@@ -178,17 +170,16 @@ Fixed=1
 Locked=0
 Notes=5254
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37223.878796296300000
-GUID=0-0-0-0
 [Wp9]
-Loc=New location
+Loc=My Waypoints
 Name=5258
 Lat=42.451442000000000
 Long=-71.121746000000002
@@ -199,17 +190,16 @@ Fixed=1
 Locked=0
 Notes=5258
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37202.995613425900000
-GUID=0-0-0-0
 [Wp10]
-Loc=New location
+Loc=My Waypoints
 Name=5264
 Lat=42.454403999999997
 Long=-71.120660000000001
@@ -220,17 +210,16 @@ Fixed=1
 Locked=0
 Notes=5264
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37223.878796296300000
-GUID=0-0-0-0
 [Wp11]
-Loc=New location
+Loc=My Waypoints
 Name=526708
 Lat=42.457760999999998
 Long=-71.121044999999995
@@ -241,17 +230,16 @@ Fixed=1
 Locked=0
 Notes=526708
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143750000000000
-GUID=0-0-0-0
 [Wp12]
-Loc=New location
+Loc=My Waypoints
 Name=526750
 Lat=42.457089000000003
 Long=-71.120312999999996
@@ -262,17 +250,16 @@ Fixed=1
 Locked=0
 Notes=526750
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143750000000000
-GUID=0-0-0-0
 [Wp13]
-Loc=New location
+Loc=My Waypoints
 Name=527614
 Lat=42.456592000000001
 Long=-71.119675999999998
@@ -283,17 +270,16 @@ Fixed=1
 Locked=0
 Notes=527614
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37202.995613425900000
-GUID=0-0-0-0
 [Wp14]
-Loc=New location
+Loc=My Waypoints
 Name=527631
 Lat=42.456251999999999
 Long=-71.119355999999996
@@ -304,17 +290,16 @@ Fixed=1
 Locked=0
 Notes=527631
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37202.995613425900000
-GUID=0-0-0-0
 [Wp15]
-Loc=New location
+Loc=My Waypoints
 Name=5278
 Lat=42.458148000000001
 Long=-71.119135000000000
@@ -325,17 +310,16 @@ Fixed=1
 Locked=0
 Notes=5278
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143750000000000
-GUID=0-0-0-0
 [Wp16]
-Loc=New location
+Loc=My Waypoints
 Name=5289
 Lat=42.459377000000003
 Long=-71.117693000000003
@@ -346,17 +330,16 @@ Fixed=1
 Locked=0
 Notes=5289
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143761574100000
-GUID=0-0-0-0
 [Wp17]
-Loc=New location
+Loc=My Waypoints
 Name=5374FIRE
 Lat=42.464182999999998
 Long=-71.119827999999998
@@ -367,17 +350,16 @@ Fixed=1
 Locked=0
 Notes=5374FIRE
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37223.878796296300000
-GUID=0-0-0-0
 [Wp18]
-Loc=New location
+Loc=My Waypoints
 Name=5376
 Lat=42.465649999999997
 Long=-71.119399000000001
@@ -388,17 +370,16 @@ Fixed=1
 Locked=0
 Notes=5376
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143773148100000
-GUID=0-0-0-0
 [Wp19]
-Loc=New location
+Loc=My Waypoints
 Name=6006
 Lat=42.439017999999997
 Long=-71.114456000000004
@@ -409,17 +390,16 @@ Fixed=1
 Locked=0
 Notes=600698
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143692129600000
-GUID=0-0-0-0
 [Wp20]
-Loc=New location
+Loc=My Waypoints
 Name=6006BLUE
 Lat=42.438594000000002
 Long=-71.114802999999995
@@ -430,17 +410,16 @@ Fixed=1
 Locked=0
 Notes=6006BLUE
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37223.878796296300000
-GUID=0-0-0-0
 [Wp21]
-Loc=New location
+Loc=My Waypoints
 Name=6014MEADOW
 Lat=42.436757000000000
 Long=-71.113223000000005
@@ -451,17 +430,16 @@ Fixed=1
 Locked=0
 Notes=6014MEADOW
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37223.878796296300000
-GUID=0-0-0-0
 [Wp22]
-Loc=New location
+Loc=My Waypoints
 Name=6029
 Lat=42.441754000000003
 Long=-71.113219999999998
@@ -472,17 +450,16 @@ Fixed=1
 Locked=0
 Notes=6029
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143692129600000
-GUID=0-0-0-0
 [Wp23]
-Loc=New location
+Loc=My Waypoints
 Name=6053
 Lat=42.436242999999997
 Long=-71.109075000000004
@@ -493,17 +470,16 @@ Fixed=1
 Locked=0
 Notes=6053
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143807870400000
-GUID=0-0-0-0
 [Wp24]
-Loc=New location
+Loc=My Waypoints
 Name=6066
 Lat=42.439250000000001
 Long=-71.107500000000002
@@ -514,17 +490,16 @@ Fixed=1
 Locked=0
 Notes=6066
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143715277800000
-GUID=0-0-0-0
 [Wp25]
-Loc=New location
+Loc=My Waypoints
 Name=6067
 Lat=42.439763999999997
 Long=-71.107581999999994
@@ -535,17 +510,16 @@ Fixed=1
 Locked=0
 Notes=6067
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143715277800000
-GUID=0-0-0-0
 [Wp26]
-Loc=New location
+Loc=My Waypoints
 Name=6071
 Lat=42.434766000000003
 Long=-71.105874000000000
@@ -556,17 +530,16 @@ Fixed=1
 Locked=0
 Notes=6071
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143715277800000
-GUID=0-0-0-0
 [Wp27]
-Loc=New location
+Loc=My Waypoints
 Name=6073
 Lat=42.433304000000000
 Long=-71.106599000000003
@@ -577,17 +550,16 @@ Fixed=1
 Locked=0
 Notes=6073
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143703703700000
-GUID=0-0-0-0
 [Wp28]
-Loc=New location
+Loc=My Waypoints
 Name=6084
 Lat=42.437337999999997
 Long=-71.104771999999997
@@ -598,17 +570,16 @@ Fixed=1
 Locked=0
 Notes=6084
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143715277800000
-GUID=0-0-0-0
 [Wp29]
-Loc=New location
+Loc=My Waypoints
 Name=6130
 Lat=42.442196000000003
 Long=-71.110974999999996
@@ -619,17 +590,16 @@ Fixed=1
 Locked=0
 Notes=6130
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143692129600000
-GUID=0-0-0-0
 [Wp30]
-Loc=New location
+Loc=My Waypoints
 Name=6131
 Lat=42.442981000000003
 Long=-71.111440999999999
@@ -640,17 +610,16 @@ Fixed=1
 Locked=0
 Notes=6131
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143726851800000
-GUID=0-0-0-0
 [Wp31]
-Loc=New location
+Loc=My Waypoints
 Name=6153
 Lat=42.444772999999998
 Long=-71.108881999999994
@@ -661,17 +630,16 @@ Fixed=1
 Locked=0
 Notes=6153
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143807870400000
-GUID=0-0-0-0
 [Wp32]
-Loc=New location
+Loc=My Waypoints
 Name=6171
 Lat=42.443592000000002
 Long=-71.106301000000002
@@ -682,17 +650,16 @@ Fixed=1
 Locked=0
 Notes=6171
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143807870400000
-GUID=0-0-0-0
 [Wp33]
-Loc=New location
+Loc=My Waypoints
 Name=6176
 Lat=42.447803999999998
 Long=-71.106623999999996
@@ -703,17 +670,16 @@ Fixed=1
 Locked=0
 Notes=6176
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143796296300000
-GUID=0-0-0-0
 [Wp34]
-Loc=New location
+Loc=My Waypoints
 Name=6177
 Lat=42.448447999999999
 Long=-71.106157999999994
@@ -724,17 +690,16 @@ Fixed=1
 Locked=0
 Notes=6177
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143796296300000
-GUID=0-0-0-0
 [Wp35]
-Loc=New location
+Loc=My Waypoints
 Name=6272
 Lat=42.453415000000000
 Long=-71.106782999999993
@@ -745,17 +710,16 @@ Fixed=1
 Locked=0
 Notes=6272
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143692129600000
-GUID=0-0-0-0
 [Wp36]
-Loc=New location
+Loc=My Waypoints
 Name=6272
 Lat=42.453434000000001
 Long=-71.107253000000000
@@ -766,17 +730,16 @@ Fixed=1
 Locked=0
 Notes=6272
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143703703700000
-GUID=0-0-0-0
 [Wp37]
-Loc=New location
+Loc=My Waypoints
 Name=6278
 Lat=42.458297999999999
 Long=-71.106770999999995
@@ -787,17 +750,16 @@ Fixed=1
 Locked=0
 Notes=6278
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143796296300000
-GUID=0-0-0-0
 [Wp38]
-Loc=New location
+Loc=My Waypoints
 Name=6280
 Lat=42.451430000000002
 Long=-71.105412999999999
@@ -808,17 +770,16 @@ Fixed=1
 Locked=0
 Notes=6280
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37211.960856481500000
-GUID=0-0-0-0
 [Wp39]
-Loc=New location
+Loc=My Waypoints
 Name=6283
 Lat=42.453845000000001
 Long=-71.105205999999995
@@ -829,17 +790,16 @@ Fixed=1
 Locked=0
 Notes=6283
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37211.960856481500000
-GUID=0-0-0-0
 [Wp40]
-Loc=New location
+Loc=My Waypoints
 Name=6289
 Lat=42.459986000000001
 Long=-71.106170000000006
@@ -850,17 +810,16 @@ Fixed=1
 Locked=0
 Notes=6289
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37211.960856481500000
-GUID=0-0-0-0
 [Wp41]
-Loc=New location
+Loc=My Waypoints
 Name=6297
 Lat=42.457616000000002
 Long=-71.105115999999995
@@ -871,17 +830,16 @@ Fixed=1
 Locked=0
 Notes=6297
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143796296300000
-GUID=0-0-0-0
 [Wp42]
-Loc=New location
+Loc=My Waypoints
 Name=6328
 Lat=42.467109999999998
 Long=-71.113574000000000
@@ -892,17 +850,16 @@ Fixed=1
 Locked=0
 Notes=6328
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143773148100000
-GUID=0-0-0-0
 [Wp43]
-Loc=New location
+Loc=My Waypoints
 Name=6354
 Lat=42.464202000000000
 Long=-71.109863000000004
@@ -913,17 +870,16 @@ Fixed=1
 Locked=0
 Notes=6354
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143784722200000
-GUID=0-0-0-0
 [Wp44]
-Loc=New location
+Loc=My Waypoints
 Name=635722
 Lat=42.466459000000000
 Long=-71.110067000000001
@@ -934,17 +890,16 @@ Fixed=1
 Locked=0
 Notes=635722
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143773148100000
-GUID=0-0-0-0
 [Wp45]
-Loc=New location
+Loc=My Waypoints
 Name=635783
 Lat=42.466557000000002
 Long=-71.109409999999997
@@ -955,17 +910,16 @@ Fixed=1
 Locked=0
 Notes=635783
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143773148100000
-GUID=0-0-0-0
 [Wp46]
-Loc=New location
+Loc=My Waypoints
 Name=6373
 Lat=42.463495000000002
 Long=-71.107117000000002
@@ -976,17 +930,16 @@ Fixed=1
 Locked=0
 Notes=6373
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143784722200000
-GUID=0-0-0-0
 [Wp47]
-Loc=New location
+Loc=My Waypoints
 Name=6634
 Lat=42.401051000000002
 Long=-71.110241000000002
@@ -997,17 +950,16 @@ Fixed=1
 Locked=0
 Notes=6634
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143703703700000
-GUID=0-0-0-0
 [Wp48]
-Loc=New location
+Loc=My Waypoints
 Name=6979
 Lat=42.432620999999997
 Long=-71.106532000000001
@@ -1018,17 +970,16 @@ Fixed=1
 Locked=0
 Notes=6979
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143703703700000
-GUID=0-0-0-0
 [Wp49]
-Loc=New location
+Loc=My Waypoints
 Name=6997
 Lat=42.431032999999999
 Long=-71.107883000000001
@@ -1039,17 +990,16 @@ Fixed=1
 Locked=0
 Notes=6997
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37211.960856481500000
-GUID=0-0-0-0
 [Wp50]
-Loc=New location
+Loc=My Waypoints
 Name=BEAR HILL
 Lat=42.465687000000003
 Long=-71.107360000000000
@@ -1060,17 +1010,16 @@ Fixed=1
 Locked=0
 Notes=Bear Hill Tower
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143784722200000
-GUID=0-0-0-0
 [Wp51]
-Loc=New location
+Loc=My Waypoints
 Name=BELLEVUE
 Lat=42.430950000000003
 Long=-71.107628000000005
@@ -1081,17 +1030,16 @@ Fixed=1
 Locked=0
 Notes=Bellevue Parking Lot
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.012673611100000
-GUID=0-0-0-0
 [Wp52]
-Loc=New location
+Loc=My Waypoints
 Name=6016
 Lat=42.438665999999998
 Long=-71.114079000000004
@@ -1102,17 +1050,16 @@ Fixed=1
 Locked=0
 Notes=Bike Loop Connector
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37223.878796296300000
-GUID=0-0-0-0
 [Wp53]
-Loc=New location
+Loc=My Waypoints
 Name=5236BRIDGE
 Lat=42.456468999999998
 Long=-71.124651000000000
@@ -1123,17 +1070,16 @@ Fixed=1
 Locked=0
 Notes=Bridge
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143738425900000
-GUID=0-0-0-0
 [Wp54]
-Loc=New location
+Loc=My Waypoints
 Name=5376BRIDGE
 Lat=42.465758999999998
 Long=-71.119815000000003
@@ -1144,17 +1090,16 @@ Fixed=1
 Locked=0
 Notes=Bridge
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143761574100000
-GUID=0-0-0-0
 [Wp55]
-Loc=New location
+Loc=My Waypoints
 Name=6181CROSS
 Lat=42.442993000000001
 Long=-71.105878000000004
@@ -1165,17 +1110,16 @@ Fixed=1
 Locked=0
 Notes=Crossing
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143807870400000
-GUID=0-0-0-0
 [Wp56]
-Loc=New location
+Loc=My Waypoints
 Name=6042CROSS
 Lat=42.435471999999997
 Long=-71.109663999999995
@@ -1186,17 +1130,16 @@ Fixed=1
 Locked=0
 Notes=Crossing
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143807870400000
-GUID=0-0-0-0
 [Wp57]
-Loc=New location
+Loc=My Waypoints
 Name=DARKHOLLPO
 Lat=42.458516000000003
 Long=-71.103645999999998
@@ -1207,17 +1150,16 @@ Fixed=1
 Locked=0
 Notes=Dark Hollow Pond
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=25569.000000000000000
-GUID=0-0-0-0
 [Wp58]
-Loc=New location
+Loc=My Waypoints
 Name=6121DEAD
 Lat=42.443109000000000
 Long=-71.112674999999996
@@ -1228,17 +1170,16 @@ Fixed=1
 Locked=0
 Notes=Dead End
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143715277800000
-GUID=0-0-0-0
 [Wp59]
-Loc=New location
+Loc=My Waypoints
 Name=5179DEAD
 Lat=42.449866000000000
 Long=-71.119298000000001
@@ -1249,17 +1190,16 @@ Fixed=1
 Locked=0
 Notes=Dead End
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143738425900000
-GUID=0-0-0-0
 [Wp60]
-Loc=New location
+Loc=My Waypoints
 Name=5299DEAD
 Lat=42.459629000000000
 Long=-71.116523999999998
@@ -1270,17 +1210,16 @@ Fixed=1
 Locked=0
 Notes=Dead End
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143761574100000
-GUID=0-0-0-0
 [Wp61]
-Loc=New location
+Loc=My Waypoints
 Name=5376DEAD
 Lat=42.465485000000001
 Long=-71.119147999999996
@@ -1291,17 +1230,16 @@ Fixed=1
 Locked=0
 Notes=Dead End
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143773148100000
-GUID=0-0-0-0
 [Wp62]
-Loc=New location
+Loc=My Waypoints
 Name=6353DEAD
 Lat=42.462775999999998
 Long=-71.109986000000006
@@ -1312,17 +1250,16 @@ Fixed=1
 Locked=0
 Notes=Dead End
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143784722200000
-GUID=0-0-0-0
 [Wp63]
-Loc=New location
+Loc=My Waypoints
 Name=6155DEAD
 Lat=42.446793000000000
 Long=-71.108784000000000
@@ -1333,17 +1270,16 @@ Fixed=1
 Locked=0
 Notes=Dead End
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143796296300000
-GUID=0-0-0-0
 [Wp64]
-Loc=New location
+Loc=My Waypoints
 Name=GATE14
 Lat=42.451203999999997
 Long=-71.126602000000005
@@ -1354,17 +1290,16 @@ Fixed=1
 Locked=0
 Notes=Gate 14
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143738425900000
-GUID=0-0-0-0
 [Wp65]
-Loc=New location
+Loc=My Waypoints
 Name=GATE16
 Lat=42.458499000000003
 Long=-71.122078000000002
@@ -1375,17 +1310,16 @@ Fixed=1
 Locked=0
 Notes=Gate 16
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143750000000000
-GUID=0-0-0-0
 [Wp66]
-Loc=New location
+Loc=My Waypoints
 Name=GATE17
 Lat=42.459375999999999
 Long=-71.119237999999996
@@ -1396,17 +1330,16 @@ Fixed=1
 Locked=0
 Notes=Gate 17
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143761574100000
-GUID=0-0-0-0
 [Wp67]
-Loc=New location
+Loc=My Waypoints
 Name=GATE19
 Lat=42.466352999999998
 Long=-71.119240000000005
@@ -1417,17 +1350,16 @@ Fixed=1
 Locked=0
 Notes=Gate 19
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143773148100000
-GUID=0-0-0-0
 [Wp68]
-Loc=New location
+Loc=My Waypoints
 Name=GATE21
 Lat=42.468654999999998
 Long=-71.107697000000002
@@ -1438,17 +1370,16 @@ Fixed=1
 Locked=0
 Notes=Gate 21
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143784722200000
-GUID=0-0-0-0
 [Wp69]
-Loc=New location
+Loc=My Waypoints
 Name=GATE24
 Lat=42.456718000000002
 Long=-71.102973000000006
@@ -1459,17 +1390,16 @@ Fixed=1
 Locked=0
 Notes=Gate 24
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143784722200000
-GUID=0-0-0-0
 [Wp70]
-Loc=New location
+Loc=My Waypoints
 Name=GATE5
 Lat=42.430847000000000
 Long=-71.107690000000005
@@ -1480,17 +1410,16 @@ Fixed=1
 Locked=0
 Notes=Gate 5
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37223.878796296300000
-GUID=0-0-0-0
 [Wp71]
-Loc=New location
+Loc=My Waypoints
 Name=GATE6
 Lat=42.431240000000003
 Long=-71.109235999999996
@@ -1501,17 +1430,16 @@ Fixed=1
 Locked=0
 Notes=Gate 6
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37202.995613425900000
-GUID=0-0-0-0
 [Wp72]
-Loc=New location
+Loc=My Waypoints
 Name=6077LOGS
 Lat=42.439501999999997
 Long=-71.106555999999998
@@ -1522,17 +1450,16 @@ Fixed=1
 Locked=0
 Notes=Log Crossing
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.012685185200000
-GUID=0-0-0-0
 [Wp73]
-Loc=New location
+Loc=My Waypoints
 Name=5148NANEPA
 Lat=42.449764999999999
 Long=-71.122320000000002
@@ -1543,17 +1470,16 @@ Fixed=1
 Locked=0
 Notes=Nanepashemet Road Crossing
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37202.995613425900000
-GUID=0-0-0-0
 [Wp74]
-Loc=New location
+Loc=My Waypoints
 Name=5267OBSTAC
 Lat=42.457388000000002
 Long=-71.119844999999998
@@ -1564,17 +1490,16 @@ Fixed=1
 Locked=0
 Notes=Obstacle
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143750000000000
-GUID=0-0-0-0
 [Wp75]
-Loc=New location
+Loc=My Waypoints
 Name=PANTHRCAVE
 Lat=42.434980000000003
 Long=-71.109942000000004
@@ -1585,17 +1510,16 @@ Fixed=1
 Locked=0
 Notes=Panther Cave
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37202.995613425900000
-GUID=0-0-0-0
 [Wp76]
-Loc=New location
+Loc=My Waypoints
 Name=5252PURPLE
 Lat=42.453256000000003
 Long=-71.121211000000002
@@ -1606,17 +1530,16 @@ Fixed=1
 Locked=0
 Notes=Purple Rock Hill
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37202.995613425900000
-GUID=0-0-0-0
 [Wp77]
-Loc=New location
+Loc=My Waypoints
 Name=5287WATER
 Lat=42.457734000000002
 Long=-71.117480999999998
@@ -1627,17 +1550,16 @@ Fixed=1
 Locked=0
 Notes=Reservoir
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143761574100000
-GUID=0-0-0-0
 [Wp78]
-Loc=New location
+Loc=My Waypoints
 Name=5239ROAD
 Lat=42.459277999999998
 Long=-71.124573999999996
@@ -1648,17 +1570,16 @@ Fixed=1
 Locked=0
 Notes=Road
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143750000000000
-GUID=0-0-0-0
 [Wp79]
-Loc=New location
+Loc=My Waypoints
 Name=5278ROAD
 Lat=42.458781999999999
 Long=-71.118990999999994
@@ -1669,17 +1590,16 @@ Fixed=1
 Locked=0
 Notes=Road
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143761574100000
-GUID=0-0-0-0
 [Wp80]
-Loc=New location
+Loc=My Waypoints
 Name=5058ROAD
 Lat=42.439993000000001
 Long=-71.120925000000000
@@ -1690,17 +1610,16 @@ Fixed=1
 Locked=0
 Notes=Road Crossing
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.012662037000000
-GUID=0-0-0-0
 [Wp81]
-Loc=New location
+Loc=My Waypoints
 Name=SHEEPFOLD
 Lat=42.453415000000000
 Long=-71.106781999999995
@@ -1711,17 +1630,16 @@ Fixed=1
 Locked=0
 Notes=Sheepfold Parking Lot
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.012650463000000
-GUID=0-0-0-0
 [Wp82]
-Loc=New location
+Loc=My Waypoints
 Name=SOAPBOX
 Lat=42.455956000000000
 Long=-71.107483000000002
@@ -1732,17 +1650,16 @@ Fixed=1
 Locked=0
 Notes=Soap Box Derby Track
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.143796296300000
-GUID=0-0-0-0
 [Wp83]
-Loc=New location
+Loc=My Waypoints
 Name=5376STREAM
 Lat=42.465913000000000
 Long=-71.119327999999996
@@ -1753,17 +1670,16 @@ Fixed=1
 Locked=0
 Notes=Stream Crossing
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37202.995613425900000
-GUID=0-0-0-0
 [Wp84]
-Loc=New location
+Loc=My Waypoints
 Name=5144SUMMIT
 Lat=42.445359000000003
 Long=-71.122844999999998
@@ -1774,17 +1690,16 @@ Fixed=1
 Locked=0
 Notes=Summit
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37223.878796296300000
-GUID=0-0-0-0
 [Wp85]
-Loc=New location
+Loc=My Waypoints
 Name=5150TANK
 Lat=42.441727000000000
 Long=-71.121675999999994
@@ -1795,19 +1710,17 @@ Fixed=1
 Locked=0
 Notes=Water Tank
 Rel=
-RelSet=1
-RcCount=1
+RelSet=0
+RcCount=0
 RcRadius=0.000000000000000
 Show=1
 RcShow=0
 SeaTemp=-32678.000000000000000
 Depth=65535.000000000000000
 Time=37044.012685185200000
-GUID=0-0-0-0
 [Rt0]
 Name=BELLEVUE
 Visible=1
-Guid=0-0-0-0
 Mk0=BELLEVUE
 Cog0=0.000000000000000
 Eta0=0.000000000000000
@@ -1815,7 +1728,7 @@ LengthPredictedDrift0=0.000000000000000
 PredictedSet0=0.000000000000000
 PredictedSog0=0.000000000000000
 PredictedTime0=0.000000000000000
-PredictedTwa20=0.000000000000000
+PredictedTwa0=0.000000000000000
 PredictedTwd0=0.000000000000000
 PredictedTws0=0.000000000000000
 Mk1=GATE6
@@ -1825,7 +1738,7 @@ LengthPredictedDrift1=0.000000000000000
 PredictedSet1=0.000000000000000
 PredictedSog1=0.000000000000000
 PredictedTime1=0.000000000000000
-PredictedTwa21=0.000000000000000
+PredictedTwa1=0.000000000000000
 PredictedTwd1=0.000000000000000
 PredictedTws1=0.000000000000000
 Mk2=PANTHRCAVE
@@ -1835,7 +1748,7 @@ LengthPredictedDrift2=0.000000000000000
 PredictedSet2=0.000000000000000
 PredictedSog2=0.000000000000000
 PredictedTime2=0.000000000000000
-PredictedTwa22=0.000000000000000
+PredictedTwa2=0.000000000000000
 PredictedTwd2=0.000000000000000
 PredictedTws2=0.000000000000000
 Mk3=6014MEADOW
@@ -1845,7 +1758,7 @@ LengthPredictedDrift3=0.000000000000000
 PredictedSet3=0.000000000000000
 PredictedSog3=0.000000000000000
 PredictedTime3=0.000000000000000
-PredictedTwa23=0.000000000000000
+PredictedTwa3=0.000000000000000
 PredictedTwd3=0.000000000000000
 PredictedTws3=0.000000000000000
 Mk4=6006
@@ -1855,7 +1768,7 @@ LengthPredictedDrift4=0.000000000000000
 PredictedSet4=0.000000000000000
 PredictedSog4=0.000000000000000
 PredictedTime4=0.000000000000000
-PredictedTwa24=0.000000000000000
+PredictedTwa4=0.000000000000000
 PredictedTwd4=0.000000000000000
 PredictedTws4=0.000000000000000
 Mk5=6006BLUE
@@ -1865,7 +1778,7 @@ LengthPredictedDrift5=0.000000000000000
 PredictedSet5=0.000000000000000
 PredictedSog5=0.000000000000000
 PredictedTime5=0.000000000000000
-PredictedTwa25=0.000000000000000
+PredictedTwa5=0.000000000000000
 PredictedTwd5=0.000000000000000
 PredictedTws5=0.000000000000000
 Mk6=5096
@@ -1875,7 +1788,7 @@ LengthPredictedDrift6=0.000000000000000
 PredictedSet6=0.000000000000000
 PredictedSog6=0.000000000000000
 PredictedTime6=0.000000000000000
-PredictedTwa26=0.000000000000000
+PredictedTwa6=0.000000000000000
 PredictedTwd6=0.000000000000000
 PredictedTws6=0.000000000000000
 Mk7=5066
@@ -1885,7 +1798,7 @@ LengthPredictedDrift7=0.000000000000000
 PredictedSet7=0.000000000000000
 PredictedSog7=0.000000000000000
 PredictedTime7=0.000000000000000
-PredictedTwa27=0.000000000000000
+PredictedTwa7=0.000000000000000
 PredictedTwd7=0.000000000000000
 PredictedTws7=0.000000000000000
 Mk8=5067
@@ -1895,7 +1808,7 @@ LengthPredictedDrift8=0.000000000000000
 PredictedSet8=0.000000000000000
 PredictedSog8=0.000000000000000
 PredictedTime8=0.000000000000000
-PredictedTwa28=0.000000000000000
+PredictedTwa8=0.000000000000000
 PredictedTwd8=0.000000000000000
 PredictedTws8=0.000000000000000
 Mk9=5058ROAD
@@ -1905,7 +1818,7 @@ LengthPredictedDrift9=0.000000000000000
 PredictedSet9=0.000000000000000
 PredictedSog9=0.000000000000000
 PredictedTime9=0.000000000000000
-PredictedTwa29=0.000000000000000
+PredictedTwa9=0.000000000000000
 PredictedTwd9=0.000000000000000
 PredictedTws9=0.000000000000000
 Mk10=5150TANK
@@ -1915,7 +1828,7 @@ LengthPredictedDrift10=0.000000000000000
 PredictedSet10=0.000000000000000
 PredictedSog10=0.000000000000000
 PredictedTime10=0.000000000000000
-PredictedTwa210=0.000000000000000
+PredictedTwa10=0.000000000000000
 PredictedTwd10=0.000000000000000
 PredictedTws10=0.000000000000000
 Mk11=5142
@@ -1925,7 +1838,7 @@ LengthPredictedDrift11=0.000000000000000
 PredictedSet11=0.000000000000000
 PredictedSog11=0.000000000000000
 PredictedTime11=0.000000000000000
-PredictedTwa211=0.000000000000000
+PredictedTwa11=0.000000000000000
 PredictedTwd11=0.000000000000000
 PredictedTws11=0.000000000000000
 Mk12=5144SUMMIT
@@ -1935,7 +1848,7 @@ LengthPredictedDrift12=0.000000000000000
 PredictedSet12=0.000000000000000
 PredictedSog12=0.000000000000000
 PredictedTime12=0.000000000000000
-PredictedTwa212=0.000000000000000
+PredictedTwa12=0.000000000000000
 PredictedTwd12=0.000000000000000
 PredictedTws12=0.000000000000000
 Mk13=5156
@@ -1945,7 +1858,7 @@ LengthPredictedDrift13=0.000000000000000
 PredictedSet13=0.000000000000000
 PredictedSog13=0.000000000000000
 PredictedTime13=0.000000000000000
-PredictedTwa213=0.000000000000000
+PredictedTwa13=0.000000000000000
 PredictedTwd13=0.000000000000000
 PredictedTws13=0.000000000000000
 Mk14=5148NANEPA
@@ -1955,7 +1868,7 @@ LengthPredictedDrift14=0.000000000000000
 PredictedSet14=0.000000000000000
 PredictedSog14=0.000000000000000
 PredictedTime14=0.000000000000000
-PredictedTwa214=0.000000000000000
+PredictedTwa14=0.000000000000000
 PredictedTwd14=0.000000000000000
 PredictedTws14=0.000000000000000
 Mk15=5258
@@ -1965,7 +1878,7 @@ LengthPredictedDrift15=0.000000000000000
 PredictedSet15=0.000000000000000
 PredictedSog15=0.000000000000000
 PredictedTime15=0.000000000000000
-PredictedTwa215=0.000000000000000
+PredictedTwa15=0.000000000000000
 PredictedTwd15=0.000000000000000
 PredictedTws15=0.000000000000000
 Mk16=5252PURPLE
@@ -1975,7 +1888,7 @@ LengthPredictedDrift16=0.000000000000000
 PredictedSet16=0.000000000000000
 PredictedSog16=0.000000000000000
 PredictedTime16=0.000000000000000
-PredictedTwa216=0.000000000000000
+PredictedTwa16=0.000000000000000
 PredictedTwd16=0.000000000000000
 PredictedTws16=0.000000000000000
 Mk17=527631
@@ -1985,7 +1898,7 @@ LengthPredictedDrift17=0.000000000000000
 PredictedSet17=0.000000000000000
 PredictedSog17=0.000000000000000
 PredictedTime17=0.000000000000000
-PredictedTwa217=0.000000000000000
+PredictedTwa17=0.000000000000000
 PredictedTwd17=0.000000000000000
 PredictedTws17=0.000000000000000
 Mk18=527614
@@ -1995,7 +1908,7 @@ LengthPredictedDrift18=0.000000000000000
 PredictedSet18=0.000000000000000
 PredictedSog18=0.000000000000000
 PredictedTime18=0.000000000000000
-PredictedTwa218=0.000000000000000
+PredictedTwa18=0.000000000000000
 PredictedTwd18=0.000000000000000
 PredictedTws18=0.000000000000000
 Mk19=5267OBSTAC
@@ -2005,7 +1918,7 @@ LengthPredictedDrift19=0.000000000000000
 PredictedSet19=0.000000000000000
 PredictedSog19=0.000000000000000
 PredictedTime19=0.000000000000000
-PredictedTwa219=0.000000000000000
+PredictedTwa19=0.000000000000000
 PredictedTwd19=0.000000000000000
 PredictedTws19=0.000000000000000
 Mk20=5278
@@ -2015,7 +1928,7 @@ LengthPredictedDrift20=0.000000000000000
 PredictedSet20=0.000000000000000
 PredictedSog20=0.000000000000000
 PredictedTime20=0.000000000000000
-PredictedTwa220=0.000000000000000
+PredictedTwa20=0.000000000000000
 PredictedTwd20=0.000000000000000
 PredictedTws20=0.000000000000000
 Mk21=5289
@@ -2025,7 +1938,7 @@ LengthPredictedDrift21=0.000000000000000
 PredictedSet21=0.000000000000000
 PredictedSog21=0.000000000000000
 PredictedTime21=0.000000000000000
-PredictedTwa221=0.000000000000000
+PredictedTwa21=0.000000000000000
 PredictedTwd21=0.000000000000000
 PredictedTws21=0.000000000000000
 Mk22=5374FIRE
@@ -2035,7 +1948,7 @@ LengthPredictedDrift22=0.000000000000000
 PredictedSet22=0.000000000000000
 PredictedSog22=0.000000000000000
 PredictedTime22=0.000000000000000
-PredictedTwa222=0.000000000000000
+PredictedTwa22=0.000000000000000
 PredictedTwd22=0.000000000000000
 PredictedTws22=0.000000000000000
 Mk23=5376
@@ -2045,7 +1958,7 @@ LengthPredictedDrift23=0.000000000000000
 PredictedSet23=0.000000000000000
 PredictedSog23=0.000000000000000
 PredictedTime23=0.000000000000000
-PredictedTwa223=0.000000000000000
+PredictedTwa23=0.000000000000000
 PredictedTwd23=0.000000000000000
 PredictedTws23=0.000000000000000
 Mk24=5376STREAM
@@ -2055,7 +1968,7 @@ LengthPredictedDrift24=0.000000000000000
 PredictedSet24=0.000000000000000
 PredictedSog24=0.000000000000000
 PredictedTime24=0.000000000000000
-PredictedTwa224=0.000000000000000
+PredictedTwa24=0.000000000000000
 PredictedTwd24=0.000000000000000
 PredictedTws24=0.000000000000000
 Mk25=6328
@@ -2065,7 +1978,7 @@ LengthPredictedDrift25=0.000000000000000
 PredictedSet25=0.000000000000000
 PredictedSog25=0.000000000000000
 PredictedTime25=0.000000000000000
-PredictedTwa225=0.000000000000000
+PredictedTwa25=0.000000000000000
 PredictedTwd25=0.000000000000000
 PredictedTws25=0.000000000000000
 Mk26=635722
@@ -2075,7 +1988,7 @@ LengthPredictedDrift26=0.000000000000000
 PredictedSet26=0.000000000000000
 PredictedSog26=0.000000000000000
 PredictedTime26=0.000000000000000
-PredictedTwa226=0.000000000000000
+PredictedTwa26=0.000000000000000
 PredictedTwd26=0.000000000000000
 PredictedTws26=0.000000000000000
 Mk27=635783
@@ -2085,7 +1998,7 @@ LengthPredictedDrift27=0.000000000000000
 PredictedSet27=0.000000000000000
 PredictedSog27=0.000000000000000
 PredictedTime27=0.000000000000000
-PredictedTwa227=0.000000000000000
+PredictedTwa27=0.000000000000000
 PredictedTwd27=0.000000000000000
 PredictedTws27=0.000000000000000
 Mk28=6373
@@ -2095,7 +2008,7 @@ LengthPredictedDrift28=0.000000000000000
 PredictedSet28=0.000000000000000
 PredictedSog28=0.000000000000000
 PredictedTime28=0.000000000000000
-PredictedTwa228=0.000000000000000
+PredictedTwa28=0.000000000000000
 PredictedTwd28=0.000000000000000
 PredictedTws28=0.000000000000000
 Mk29=BEAR HILL
@@ -2105,7 +2018,7 @@ LengthPredictedDrift29=0.000000000000000
 PredictedSet29=0.000000000000000
 PredictedSog29=0.000000000000000
 PredictedTime29=0.000000000000000
-PredictedTwa229=0.000000000000000
+PredictedTwa29=0.000000000000000
 PredictedTwd29=0.000000000000000
 PredictedTws29=0.000000000000000
 Mk30=6289
@@ -2115,7 +2028,7 @@ LengthPredictedDrift30=0.000000000000000
 PredictedSet30=0.000000000000000
 PredictedSog30=0.000000000000000
 PredictedTime30=0.000000000000000
-PredictedTwa230=0.000000000000000
+PredictedTwa30=0.000000000000000
 PredictedTwd30=0.000000000000000
 PredictedTws30=0.000000000000000
 Mk31=6297
@@ -2125,7 +2038,7 @@ LengthPredictedDrift31=0.000000000000000
 PredictedSet31=0.000000000000000
 PredictedSog31=0.000000000000000
 PredictedTime31=0.000000000000000
-PredictedTwa231=0.000000000000000
+PredictedTwa31=0.000000000000000
 PredictedTwd31=0.000000000000000
 PredictedTws31=0.000000000000000
 Mk32=6283
@@ -2135,7 +2048,7 @@ LengthPredictedDrift32=0.000000000000000
 PredictedSet32=0.000000000000000
 PredictedSog32=0.000000000000000
 PredictedTime32=0.000000000000000
-PredictedTwa232=0.000000000000000
+PredictedTwa32=0.000000000000000
 PredictedTwd32=0.000000000000000
 PredictedTws32=0.000000000000000
 Mk33=6280
@@ -2145,7 +2058,7 @@ LengthPredictedDrift33=0.000000000000000
 PredictedSet33=0.000000000000000
 PredictedSog33=0.000000000000000
 PredictedTime33=0.000000000000000
-PredictedTwa233=0.000000000000000
+PredictedTwa33=0.000000000000000
 PredictedTwd33=0.000000000000000
 PredictedTws33=0.000000000000000
 Mk34=6177
@@ -2155,7 +2068,7 @@ LengthPredictedDrift34=0.000000000000000
 PredictedSet34=0.000000000000000
 PredictedSog34=0.000000000000000
 PredictedTime34=0.000000000000000
-PredictedTwa234=0.000000000000000
+PredictedTwa34=0.000000000000000
 PredictedTwd34=0.000000000000000
 PredictedTws34=0.000000000000000
 Mk35=6176
@@ -2165,7 +2078,7 @@ LengthPredictedDrift35=0.000000000000000
 PredictedSet35=0.000000000000000
 PredictedSog35=0.000000000000000
 PredictedTime35=0.000000000000000
-PredictedTwa235=0.000000000000000
+PredictedTwa35=0.000000000000000
 PredictedTwd35=0.000000000000000
 PredictedTws35=0.000000000000000
 Mk36=6153
@@ -2175,7 +2088,7 @@ LengthPredictedDrift36=0.000000000000000
 PredictedSet36=0.000000000000000
 PredictedSog36=0.000000000000000
 PredictedTime36=0.000000000000000
-PredictedTwa236=0.000000000000000
+PredictedTwa36=0.000000000000000
 PredictedTwd36=0.000000000000000
 PredictedTws36=0.000000000000000
 Mk37=6171
@@ -2185,7 +2098,7 @@ LengthPredictedDrift37=0.000000000000000
 PredictedSet37=0.000000000000000
 PredictedSog37=0.000000000000000
 PredictedTime37=0.000000000000000
-PredictedTwa237=0.000000000000000
+PredictedTwa37=0.000000000000000
 PredictedTwd37=0.000000000000000
 PredictedTws37=0.000000000000000
 Mk38=6131
@@ -2195,7 +2108,7 @@ LengthPredictedDrift38=0.000000000000000
 PredictedSet38=0.000000000000000
 PredictedSog38=0.000000000000000
 PredictedTime38=0.000000000000000
-PredictedTwa238=0.000000000000000
+PredictedTwa38=0.000000000000000
 PredictedTwd38=0.000000000000000
 PredictedTws38=0.000000000000000
 Mk39=6130
@@ -2205,7 +2118,7 @@ LengthPredictedDrift39=0.000000000000000
 PredictedSet39=0.000000000000000
 PredictedSog39=0.000000000000000
 PredictedTime39=0.000000000000000
-PredictedTwa239=0.000000000000000
+PredictedTwa39=0.000000000000000
 PredictedTwd39=0.000000000000000
 PredictedTws39=0.000000000000000
 Mk40=6029
@@ -2215,7 +2128,7 @@ LengthPredictedDrift40=0.000000000000000
 PredictedSet40=0.000000000000000
 PredictedSog40=0.000000000000000
 PredictedTime40=0.000000000000000
-PredictedTwa240=0.000000000000000
+PredictedTwa40=0.000000000000000
 PredictedTwd40=0.000000000000000
 PredictedTws40=0.000000000000000
 Mk41=6006
@@ -2225,7 +2138,7 @@ LengthPredictedDrift41=0.000000000000000
 PredictedSet41=0.000000000000000
 PredictedSog41=0.000000000000000
 PredictedTime41=0.000000000000000
-PredictedTwa241=0.000000000000000
+PredictedTwa41=0.000000000000000
 PredictedTwd41=0.000000000000000
 PredictedTws41=0.000000000000000
 Mk42=6014MEADOW
@@ -2235,7 +2148,7 @@ LengthPredictedDrift42=0.000000000000000
 PredictedSet42=0.000000000000000
 PredictedSog42=0.000000000000000
 PredictedTime42=0.000000000000000
-PredictedTwa242=0.000000000000000
+PredictedTwa42=0.000000000000000
 PredictedTwd42=0.000000000000000
 PredictedTws42=0.000000000000000
 Mk43=PANTHRCAVE
@@ -2245,7 +2158,7 @@ LengthPredictedDrift43=0.000000000000000
 PredictedSet43=0.000000000000000
 PredictedSog43=0.000000000000000
 PredictedTime43=0.000000000000000
-PredictedTwa243=0.000000000000000
+PredictedTwa43=0.000000000000000
 PredictedTwd43=0.000000000000000
 PredictedTws43=0.000000000000000
 Mk44=GATE6
@@ -2255,7 +2168,7 @@ LengthPredictedDrift44=0.000000000000000
 PredictedSet44=0.000000000000000
 PredictedSog44=0.000000000000000
 PredictedTime44=0.000000000000000
-PredictedTwa244=0.000000000000000
+PredictedTwa44=0.000000000000000
 PredictedTwd44=0.000000000000000
 PredictedTws44=0.000000000000000
 Mk45=BELLEVUE
@@ -2265,6 +2178,6 @@ LengthPredictedDrift45=0.000000000000000
 PredictedSet45=0.000000000000000
 PredictedSog45=0.000000000000000
 PredictedTime45=0.000000000000000
-PredictedTwa245=0.000000000000000
+PredictedTwa45=0.000000000000000
 PredictedTwd45=0.000000000000000
 PredictedTws45=0.000000000000000